Add support for a name tag