moving more diagrams to json