Added global var support