[Mod] Changed metrics names.
[New] Added new metrics to JSON

Note:

Nested structure form isn't final, waiting for reply on questions.