Added URL support and better description