Added unfolding to macros