Add some mapping for Unite