Add support for existing names