Added macro replacement