Map Changes for the HoIA commit