Some adjustements on classes