Added more javadoc comments