added function arguments support. Also air support.