Add Map.invalidate to group map state changes