Refactored container to be service