Improve checkpoint interface.