Form generator enhancement