Update Checkpoint class with single responsibility