Removed circular reference to TEnvironment