Updates to handle unparsed names