Add more metrics and reformat few things along the way