Working on refactoring mapper->save and inserts