Better handling of media drives