Improved Javadocs