Added an alternative DSL for the component metadata / conflict resolution improvements.