Added Locale in EnvironmentMessage, deprecated Location