Started experimenting with model instrumentation for automatic diagram generation