No bug - Refactor metrics into singleton