Simplified the URI format