first add airpub support