CF v2 support