Enhance editor (with rich values)