Added more javadoc with descriptions