Simplify routing
Updating documentation