Fixed the new classes