Remade collections using function for setting mode (raw, agg, agg-fast)
Added missing files, damn it