Add autoenv support