Added support for url checking