Refactor to new store