Improved delete and update