Updated invoker to allow custom data dir