More mapping changes.