Refactoring - no need for service in this base bundle