Adding blkid support