Fix and optimize Storage