Add support for entryid