Map parsing updated