Changes in the model to properly reflect threads and cardinalities