Added some more functionality to stubs