Hassan adds in Javadoc comments