Add the second macro constructure