Bringing mapping closer to the Kiwi export