Change dependcy from xautoload to composer_manager
Fix bug with entity id not getting filled in