Bug 17170: (QA follow-up) Improve model structure