Fixed standalone create store