Add support for ckeditor and media fields