Adding support for autodeploy