New diagrams and JavaDoc