Adding DataItem to the core_model. A few tests broken and fixes needed.