Replaced integer IDs with UUIDs