Make Invoker better