More cfs_fields changes, fixing import/export