NX-685: Simplified, scope and javadoc