Add branch_set columns and add variables to trigger