Refactor insert to normal and bulk