EUCA-7359
Ensure that the models get ID's on them.