Added more api javadoc