DF Refactored criteria modifiers.
DF Moved criteria modifier to correct plugin.