Updated the mapper so it's more flexible