Continuing rewrite in rewrite/newModels.js