Updated the mapper so it supports mapping data to objects using multiple identifiers