Add Client Refactor Memento Pattern