Added required checks
Added url retrieve option