Before refactoring to support Genericity in Data Hierarchy
Change-Id: I59c3d621b55b64e7ce68a919b741878a5239a3d4