Added additional environment variables