Prepare for history back-up support (2)