Added valid url support from API