Changed service so that it is self registering