Update of the comments and view helpers