Added a few more environment variables