Added disaggregate flag to Variables