ServiceParams refactoring