1. Add HistoryTime detection
2. fix simple problem