Add UUIDs as a keys for entries