New entity numbering scheme