Added macro configs