Updated to support CF v2.