Refactor criteria processor

Updated API provides access to the Criteria objects being processed