Added some stubs