Add deploy/undeploy support