Improved form implementation