[geometry] adapted extension andoyer to new structure strategies