Aligned with ES 0.90, added some new metrics