Refactored to use new aggregate validation api