Implemented required changes for cloud deployment

Implemented required changes for cloud deployment