We should improve the javadoc as well. @nicolas-f