Add routing support