Added airport functionality