Added global variable support