Added MapFactory. Improved performance limit test.