Improve store structure