Added provision for endpoint url