Updated with new class information