Added support for $global