Added support for model-less forms