Update data model to increase orthogonality of aggregates.