Move Modeling Storage to RWO