Infobox reegineered with dataSource