added non-state entity action support