Minor modifications for Routing handler.