Changed URIs to use fragments