Updates to support processing of CDF files.