Javadocs comments added