Editorial feedback from Samuel
Add definitions of usage, selector, matching type and association data