Improved MapModel