Can you add test test to check if the service exists ? More over can you add some unit tests for these new classes ?