Refactored stats collection to use ActiveSupport::Notifications, be less invasive