Improved Usage Metrics - Code Suggestions