More Javadoc added