The @param and @return documentation should be adapted too