Added support for global vars in default values