Added new class format