Adapted to pyAirviro 1.0