Support new CC worker and clock