New version that does not use UUIDs.