Replaced all calls to deprecated MetadataUtils methods