Change ID handling, in preparation of UUID support
Also insert the Id when using UUIDs or other pre-specified IDs for new rows