Added more Javadoc