Finish DeploymentModel refactor
merge