Refactor invoker setup