Added disk UUID support