Updated for the current service URL