Start work on using contact info tables (cherry picked from commit 60de412)