continuing improving Metrics module