We really need the wrappers? Maybe we can find a way to achieve the same behaviour in other ways.