Changed Crossfilter to master/slave