Added some more stubs