Fix macro to pull in attributes