Moved global variables as ivars