Rework the deploy/undeploy method