Fixed route matching & Improving the request class