Move more stuff out of the way
Make type hierarchy of edges and nodes more strict
Make all batch stuff compatible with the new data structures
Fix series
More about type hierarchy
Tiny fixes here and there to avoid notifications by Eclipse
Type hierarchy once more
Updates for the metrics