Added a few more types to dmetric