Better env handling