Added new Javadocs