Added router and failed invocation flow