Optimize storage

IMAG0305