Restructuring collectors

Restructuring collectors