Keep to refactoring the services base object structure and its behaviour and methods.