Update for CF 1.0.0