Started using the invoker for 3.1.1