Added WRAP macro