bugfix and added Invoker interface