Add select fields to disks
Refactor array and disk methods