Made some Store changes