Modify and Delete added, among other changes