Simplify
Expose more router functions