Modified server invocation