Added URL validation, but current build is too restrictive