Updated to latest URIs