added remaining metric types.