Include more stuff for object equality