Added URL option and more checks