Now includes additional metrics, including moving averages