Add UPDATE, INSERT and small changes
Revert "Add UPDATE, INSERT and small changes"

This reverts commit 8c5a467909b885f623e523c746839afba7b3218d.
Revert "Revert "Add UPDATE, INSERT and small changes""

This reverts commit 6597c3b3055d27e8179f72357d1da1eeb7dee35e.