Move business logic to service repository