Adds choice support