Updates to support hook arguments.