Make default store configuration better