Add more Javadocs