Improved nested criteria.