Update description and javadoc