Updated to comply with changes in Mappable trait.