refactoring of data collectors. introduce more modularized collectors