Add a new invoker generator, and many things