Added class stubs