move with_stats decorator to base module
leverage recent changes in collector api