Maybe it could be even based on the new scheme around ValueGenerationType, i.e. considering id generation just as a special case of the more generic value generation engine? Just throwing out the idea, not sure whether it's fully mappable in the end (e.g. the IdentifierGenerator contract may also be invoked for collections, whereas ValueGenerator expects an entity).