Fix Bug 866204 - Updated metrics notation and added more collection