Hi David,
you probably need to use in Architect, based on Call.CalledAddress(DNIS), multiple SWITCH -> (you can find it under LOGICAL),until you have enough, and for every case, use SET PARTECIPANT DATA where you can set all attributes as you want, in order to have on your reports, all data as you requested.
Remember , attributes in reporting has a 3 months retentions, so I suggest to build your own DWH , to collect these informations.
If you need any further details , feel free to ask me.
Stefano