Added some javadoc