Add ActionState enum and put it to use