Added support for URL parameters