Updated commit for refactoring checkpoint