QDH: bring back topology data

QDH = quick dirty hack