Add support for routes
Update tests
Add support for clients