Changes for CF migration