Add use of leader for some mappings.