Added POD for AggregateExpression role and class.