State better supports the new class structure