Adding otc_flight feature