Change model: use map for contacts and section