Added global identifier where necessary to prevent deprecation notices