Insert and save refactoring