Now supports macro expansion of environment variables