Refactoring for persist Survey data