Refactoring datafactory with stores