+ Updated base URIs