mod. ensure aggregator is consistent with data model definition.

Change-Id: I764fcf89426ff123eb6409e1d7960ecf29cd88f4