These wrappers here are not too nice, but I think thats the only point where this has to be done in the current design right?