Use UUIDs
Merge branch 'uuid'