Rework insert manager methods