Made changed to support OpenShit deploy