Added multi-level criteria processing for more modifiers