Adjust mapping for Unite