Improvements to FIG orchestration