Add some Javadocs