[History] Improve journal and journal entry