Add addressing due to composer_manager bug with Entities
Merge pull request #107 from joshuataylor/include_addressing

Add addressing due to composer_manager bug with Entities