Improved form signature calculation