Add ag mapping and unite tweaks