Updated Metrics pages and data points on database side