adding routing support