Added changes for production deployment
Changes for deployment