Update documentation and better invocation handling