Added support for using production servers