Add ActionState and fix