Improved form map