Add uniqueID generator
Rename and cleanup baker