Add support for specifying environment variables