Added some class stubs