Made internal aggregation classes IdentifiedDataSerializable