Updated to include url option