More flexibility to EnvironmentLocale library