Refactoring, added "service" section