Added support for setting environment variables