Match avocado structure changes