Updated to the new action structure