OGM-348 JavaDoc improvements