Added javadoc stuff