Add initial support for comments and wysiwyg editor