AUTO: Improvements on deployer