Add some javadocs