Added ability to include additional fields that are immune to aggregate reset (and also support mocking aggregates).