[MapCell]: improved performance