Added some new criteria-completions.