Add some javadoc annotations