More Composite URI support.