Updating mapping script

Updating mapping script to match my database, etc.