checkpoint dcc refactoring