Refactor: Service -> Atomic