Add support for system:env