Update to use reworked actions API