Place modifiers behind feature switches