Added more Javadocs