One more CAL refactor change