first pass storage support