Refactor store creation using base Store