Added aggregate factory