optimized storage handler