Added support for variant form configuration