UAR-418 -- Adding Mapper classes in order to dp NPE guarding for information that is optional in EDS.