Refactored to not use tokens for update row iteration
Refactored updates to support null inserts