I think it's good enough like this. As long as the most common metrics are there.