Refactor wrapper get info macros (done)