will each collection element have ```data-model-id``` and ```data-model-cid``` now?