added support for data metrics