More refactoring on survey model.