Add global variable support