Added optional support for URIs without angle brackets
Added missing attribute mapping
Updated services with anglebracketless URI support