Updated for new SurvoloApi interfaces