Better env vars