Upgrades in inserting and updating