Adding support for autoenvs