Add logging
Add checkpoint