Added jdoc comments