Move modifiers to the model