Started adding map integrity functionality