Added storage buffers