Updated code for new CIF reader