Refactoring of store writers