Handle auto add of avail disks for >= 12 and < 18

We still need to make it better for 16