Updated mapstate and map