Switching away from using contact ids