Add elasticsearch into mix