Refactor metric result related