Corrected few classes