Added Equals/GetHashCode
Added filter