Refine data structure, add VoteOption and VoteTrigger for separate table