Added delete and updated error callbacks