Updated Map & null changes.