Include alternative composition syntax
Add support for optional link attributes
Provide support for arbitrary link attributes