Update mappings, include formd leader maps