Added option to specify URL