improved metrics performance