Update new class structure