Added routing, other updates