Add service and unit test