Adding Map.Lock