Added aggregate and rawQuery