Updated and added Javadoc