Beginnings of revised topology handling