Big overhaul in the invoker lib.