Further updates to the hook calling process