Redesign of the RepositoryService as part of the Engine