Add addressing due to composer_manager bug with Entities