Updated routes to work with latest 2-1-stable branch.