Further updates to support fo-dicom