Wrapper macros completed