Improved updating and deleting.