Add enhanced support for environment variables