Updated the mapping!