Updated to use a URI based syntax