Migrate modifiers to the new DSL