Improvement/3.0/cluster javadoc improvement