Refactor Choices table and added relationships