Improved and continued refactor of deployer for 0.80.x