Feature/id generator update

This should reduce ID collisions.