Improved CIF handling