Refactor Deployment model
[#79197598]