Refactoring so as to be able to deploy better