Adding handling for globals commonly used in all environments