added collectors, changed pillar format