Add action tokens #148