Criterion class, Operator store, better debugging.