Refactor Deployer class