Consolidate CSIT publisher into macro