Add URI field support