Schema update: Update pilot mappings for some fields