(COMMIT-59) Finished update and delete functionality