some metrics enhancement