Some javadoc added