Support multiple contact points, better logging