Add routing per spec