Add support for <env> tag. Doh!