Add better equality comparisons