Amend author
Refactor to support 'embedding' and to minimize namespace pollution