More javadoc added