Harder enforcing of not using addModel