#NJWT-21: Added the final doc comments