Update description and Javadocs