Updated diagrams + source generated code