Add avian support