Modifying Choice class