Update singleton macros