Updated/New Composer support for HTML_Entities

See diff for full changes