#1 udpated metric definition, added metrics for CDT.