More update for supporting topology