Add some more Javadoc