NS added more metrics