Add support for url params