Updated routes & select