Major update of sbx tags for output. #ToUpStream