Added PersistentHistoryPicker