Adding in MassStorage features