WIP: perf improvement and adding dicom checks