Support for generic cloud based metric service added
Minor formatting changes.