Added DataType attribute to Metric model