Added collector subsystem