Moved disaggregate flag to CategoricalVariables