Bug 866204 - Updated metrics notation and added more collection
Changes as listed in pull request discussion
Fixes as listed in pull request