Add improvements for form generator