Added support for all-criteria