Further refactoring
Insertion Point Refactoring