Updated to include env vars