Ongoing work on DataItems and labels

* Data Store handling / labels aligned (HEMERA-3674)
* Data Item refactored