Implemented new metrics