Added some service stubs