Add options for env_namespace and namespace_identifier