New diagrams

JIRA:

DESCRIPTION: