Additional disk related device helpers

Also changes disk related commands to use new helpers