Refactor cc registration - add early & long period