Optimize and fix models' pluralization