updated version of data collector factory