Added mass-assign protection for all models