Added more javadoc for API