Add routing properly