Update equals and hashCode implementations in some more schema classes