Refactored ResultDataItem into a core model.
Refactored PropertyDataItem into the core.
Refactored CollectionDataItem into the core.