Categorize metrics a bit better.