Multiple updates to SBP Generator logic.