Refactor contact assignments structure