Now using URIs to distinguish between components

Replaced callbackNo with a more generic URI property.
Merge branch 'master' into gh-pages