Added handling of Strings / UUIDs as the object identity id