Annotation updates, javadocs and proxy updates.