M193 - Rename DataProductType to DataProductTypeEnum
M193 - Use DatasetWindow objects, not a plain ol' dict.