Changed hashCode and equals