Improving the router callbacks.