Simplify code
BS-11358: provide new methods to manipulate diagrams