optimizations to storage