More efficient form building