Form handling update