Added equals/hashCode for proper behavior by collections