Add support for Environment Extensions