Changes in service and repository classes