Update routing, add redirect functionality