Update Javadoc and Xref