Add Metric collection tools