Updated form handling