Improve lift mapper model generator.