I couldn't think about a way without having to change a lot of code, except than overriding hashCode() and equals() in DataObject, but with no idea what other implications this would have, I didn't want to go down that way.