* Add checkpoint support