Added DISK metrics, fixed type