Fix bug introduced by removing IDGenerator