Add software collection macros