Refactor contact assignments structure
Merge pull request #222 from CruGlobal/MH-791

Refactor contact assignments structure