Updated make macro