Update singleton macro