Fixes #2905 added usage and disk classes (no lvm support yet)