added support for production server