Some additions required after Avian refactoring