extendet wrapper macros, restructured vector