Adding some javadoc