Added environment variable stuff.