Updated auto-insert and auto-delete