Enhance variant editor and Fo product