Added url checking