Started to fix equals/hashcode contract