Improved javadoc for api