Add topology support