Refactor insert differently