Added WYSIWYG support