Make env vars first class citizen in CommandBuilder