Added additional javadoc comments