Further updates to ActionChoices