Get makeWrapped working with new Wrapped implementation