Support for checkpoint