Separate Uuid and Id processing code to cope with uuids better