Moving away from UUIDs