Updated the mapping and stuff.