Changing to crossfilter internalized into collection classes.