Refactoring for easier deployments