refactoring: trait to service, @methods added