Change aggregate to ingestor for a better logic