- Do ID checks only in the class, not in unit service (or elsewhere)
- Fix repaired value list to get new objects instead of references to 
the existing.