Move to a URI based world