Class management added