Change the Verifier to support returning first class aggregrates.