Adding more types to the EquatableBuilder