Added environment_override hook