Updated some metadata fetching code to use new existing/possible methods in MetadataUtils