Add new class stubs