Harmonizing new implementation of Data