Update to support UUIDs