Start work towards moving to UUIDs