Updated action_interceptor