WIP expandig the data model (only worked on Diagram)