Updated to the latest mappings.