More Javadocs