Added validation of URLs