Improved metrics