Can we always perform the metadata check and append it if present? TypeMap lookups will result in a lot of Regex comparisons anyway. It shouldn't matter much to add one more.