Added consistent access to globals