Updated methods for criteria matching.