add topology and upstream section, strip out inclusion of annexes