Added support for route parameters