Added additional checks
Added URL support