Preparing for HTML editor v2