Added the StubHandler