Add support for url variables