UPM: owner-vs-object distinction (still has some bugs)