Add Service and separated repositories