Better env support