Add new metrics and tweak existing