Added the initial support for the generic criteria object.