Bring improvements in perf from map project.
Improvements to model and loaders and configurability.