avi: port to 0.11 API