ADD: stubs for a lot of new classes