Form generation improvement