added more metric types