Enhance All Beneficiaries forms