wrap more CCS related things with macros