Switch to a more generic data/id generator system

paves the way for adding more datatypes