Updates to include new choice interaction markup and widget