Correspondence Address merge fields

I would like the ability to put the Physical Address (Primary Record Address) and the Mailing Address on a letter. Right now the <<Address_Mail_Add_Record>> merge field pulls in the primary address when it should pull in the address for the Address type = Mailing Or a new field should be created to pull a secondary address from the Record.