Changes done to bring the interface for service and repository classes