Refactoring to deployment class