New style ID handling, get rid of auto-gen IDs