Updated handling of 'global' to support v1.3