Map iterator increased perfomance