Add plan and segment decoupling and flight segments