Added MapUtils