Updated equals methods