Added expression handling to update and delete