metrics enhancements