Added a couple of stubs