Port map key to new UI