Added global scope support