Improval towards HistoryManager