Adding data collector, and logging support