Added support for user environment variables