Changed XML to support different environments