added new classes support