Added class for storage attach/detach, for cases 83-84.