Simplify store factory