Improving Router::find()