Updated choice type