BVC refactor and survey aggregation feature