further Service methods and refactorings