Changes to include a callback after endpointURL is filled