Added BaseData hierarchy