Refactor bonding mapping installation