Added collector class