Add new diagrams to project
Refactor code and change comments