Update to new class model