I see much reorganization.
I still don't like that the account number is buried in a description.
Its harder to sort and group info.

I recommend a field that would hold the DID.
If no DID applies, then a MAC ID should apply.
Otherwise as the system scales with many clients, it will get confusing.