Made changes for deployment v2