Added rollback to update if entity already exists