Updated for support with TinyMCE