Updates to fix inserting event