ADDED: work on diagram generation
UPDATED: initialize serialization is back!