Form helper updates