Invoker class
renaming and commenting