Add airline plugig with a few changes