Updated how the 'MapSet' is added.