Added override of equals to mapped types