Consolidated the disk info queries