Added functionality to metrics