Add better maplogging