Updated/New Composer support for HTML_AJAX

See diff for full changes