Save orders process refactoring