1)Metrics improvments